Sync'd branch integration/b2g-inbound with upstream @ Sat Sep  6 19:38:39 PDT 2014