Sync'd branch integration/b2g-inbound with upstream @ Sun Sep  7 21:51:37 PDT 2014