Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 23:33:41 PDT 2014