Sync'd branch integration/b2g-inbound with upstream @ Fri Oct  3 06:54:08 PDT 2014