Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 11:58:27 PDT 2014