Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 02:45:35 PDT 2014