Sync'd branch integration/b2g-inbound with upstream @ Tue Aug 26 12:28:32 PDT 2014