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