Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 01:05:38 PDT 2014